Skip to content

Conversation

euclio
Copy link
Contributor

@euclio euclio commented Nov 3, 2019

changelog: don't warn on CRLF in print_with_newline and write_with_newline
fixes #4208.

This PR also transitions the unescaping logic to use the compiler's lexer.

@phansch phansch added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Nov 3, 2019
@@ -42,4 +42,9 @@ fn main() {
r"
"
);

// Don't warn on CRLF (#4208)
print!("\r\n");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another test case: print!("foo\rbar\n");

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added.

@euclio euclio force-pushed the crlf branch 2 times, most recently from 4c40a50 to 1329dc2 Compare November 7, 2019 03:11
Copy link
Member

@flip1995 flip1995 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

waiting for rustup.

@flip1995
Copy link
Member

flip1995 commented Nov 7, 2019

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 7, 2019

📌 Commit 1329dc2 has been approved by flip1995

@bors
Copy link
Contributor

bors commented Nov 7, 2019

🌲 The tree is currently closed for pull requests below priority 10, this pull request will be tested once the tree is reopened

flip1995 added a commit to flip1995/rust-clippy that referenced this pull request Nov 7, 2019
don't warn on CRLF in `with_newline` lints

changelog: don't warn on CRLF in `print_with_newline` and `write_with_newline`
fixes rust-lang#4208.

This PR also transitions the unescaping logic to use the compiler's lexer.
flip1995 added a commit to flip1995/rust-clippy that referenced this pull request Nov 7, 2019
don't warn on CRLF in `with_newline` lints

changelog: don't warn on CRLF in `print_with_newline` and `write_with_newline`
fixes rust-lang#4208.

This PR also transitions the unescaping logic to use the compiler's lexer.
bors added a commit that referenced this pull request Nov 7, 2019
Rollup of 4 pull requests

Successful merges:

 - #4697 (restriction lint for `std::process::exit`)
 - #4757 (Fix Deprecated lints don't expand)
 - #4758 (`DecimalLiteralRepresentation` simplification)
 - #4769 (don't warn on CRLF in `with_newline` lints)

Failed merges:

r? @ghost
bors added a commit that referenced this pull request Nov 7, 2019
Rollup of 4 pull requests

Successful merges:

 - #4697 (restriction lint for `std::process::exit`)
 - #4757 (Fix Deprecated lints don't expand)
 - #4758 (`DecimalLiteralRepresentation` simplification)
 - #4769 (don't warn on CRLF in `with_newline` lints)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Nov 7, 2019

⌛ Testing commit 1329dc2 with merge e84bbda...

bors added a commit that referenced this pull request Nov 7, 2019
don't warn on CRLF in `with_newline` lints

changelog: don't warn on CRLF in `print_with_newline` and `write_with_newline`
fixes #4208.

This PR also transitions the unescaping logic to use the compiler's lexer.
@bors
Copy link
Contributor

bors commented Nov 7, 2019

💔 Test failed - checks-travis

@flip1995
Copy link
Member

flip1995 commented Nov 8, 2019

@bors retry

bors added a commit that referenced this pull request Nov 9, 2019
don't warn on CRLF in `with_newline` lints

changelog: don't warn on CRLF in `print_with_newline` and `write_with_newline`
fixes #4208.

This PR also transitions the unescaping logic to use the compiler's lexer.
@bors
Copy link
Contributor

bors commented Nov 9, 2019

⌛ Testing commit 1329dc2 with merge d5078cd...

@bors
Copy link
Contributor

bors commented Nov 9, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: flip1995
Pushing d5078cd to master...

@bors
Copy link
Contributor

bors commented Nov 9, 2019

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward

@bors
Copy link
Contributor

bors commented Nov 11, 2019

☔ The latest upstream changes (presumably #4802) made this pull request unmergeable. Please resolve the merge conflicts.

@phansch
Copy link
Contributor

phansch commented Nov 11, 2019

@bors r=flip1995

@bors
Copy link
Contributor

bors commented Nov 11, 2019

📌 Commit 403ce3f has been approved by flip1995

@bors
Copy link
Contributor

bors commented Nov 11, 2019

⌛ Testing commit 403ce3f with merge a2cde05...

bors added a commit that referenced this pull request Nov 11, 2019
don't warn on CRLF in `with_newline` lints

changelog: don't warn on CRLF in `print_with_newline` and `write_with_newline`
fixes #4208.

This PR also transitions the unescaping logic to use the compiler's lexer.
@bors
Copy link
Contributor

bors commented Nov 11, 2019

💔 Test failed - status-appveyor

@tesuji
Copy link
Contributor

tesuji commented Nov 12, 2019

This needs to be rebased agains upstream master.

@flip1995
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Nov 12, 2019

📌 Commit add7664 has been approved by flip1995

bors added a commit that referenced this pull request Nov 12, 2019
don't warn on CRLF in `with_newline` lints

changelog: don't warn on CRLF in `print_with_newline` and `write_with_newline`
fixes #4208.

This PR also transitions the unescaping logic to use the compiler's lexer.
@bors
Copy link
Contributor

bors commented Nov 12, 2019

⌛ Testing commit add7664 with merge 180f870...

@bors
Copy link
Contributor

bors commented Nov 12, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: flip1995
Pushing 180f870 to master...

@bors bors merged commit add7664 into rust-lang:master Nov 12, 2019
@euclio euclio deleted the crlf branch November 12, 2019 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

write_with_newline should not warn when "\n" is preceded by "\r"
5 participants